Merge from trunk
authorDaniel Colascione <dancol@dancol.org>
Sun, 7 Oct 2012 22:31:58 +0000 (14:31 -0800)
committerDaniel Colascione <dancol@dancol.org>
Sun, 7 Oct 2012 22:31:58 +0000 (14:31 -0800)
commitd08b49b097932867d8bdf2143e5fa889f753459f
tree80c7a76d0434dbf72721b7986960765cd01bec3b
parent7e201d24b98152ac53ab0344b60cf2045bc9fda7
parent0cce4afa30aec0683d7f53bec1e7fc07eebb5708
Merge from trunk
36 files changed:
configure.ac
lisp/faces.el
lisp/international/mule-cmds.el
lisp/mouse.el
lisp/server.el
lisp/simple.el
lisp/startup.el
lisp/term/ns-win.el
src/Makefile.in
src/dispextern.h
src/emacs.c
src/font.h
src/fontset.c
src/frame.c
src/frame.h
src/image.c
src/keyboard.c
src/keyboard.h
src/menu.c
src/process.c
src/termhooks.h
src/unexw32.c
src/w32.c
src/w32.h
src/w32fns.c
src/w32heap.c
src/w32inevt.c
src/w32menu.c
src/w32proc.c
src/w32select.c
src/w32term.c
src/w32term.h
src/w32xfns.c
src/window.c
src/xdisp.c
src/xfaces.c